included axis remove
fixed axis re-setting during tracks re-definition
Including recent changes in the api