Improved aiming
New location for grid lab