lamps modes added
last commit before merging