update to draft3

Updated code to reflect draft3 of sight-and-light