Moving in more LS enhancements - tyo fix from FrankS