Save of trigonaut, with "small" changes.