IF/laser/light changes fixed