add back in lamp stuff