Changes in prototype, same as last commits in Main FancyTraveller application