working on longitudinal tracker
preparing the structure
Minor changes