updated for lighting / surfacing tool additions