Implemented TC 3 and added sub tracking