Merged lily and my work