Remove torch and add lamp instead