After Tracking

Still some issues to be resolved