Prefix car and vector functions
Re-add track modifiers