added changes to work and lunaites