Safety commit. Further implementations on extension to solarsystem.