Laser update - fixing the NaN and list bug