LSSM patch

More info to come