Improvements for Ninja. First shot.