Made changes to the way lightly works