redid lamps again