Today
Fix scientist not moving (merge)