re-orderd and fixed tracking