added logic for dealing with lasers (1st draft)