Added lamp stuff