Add fix function
Improve Track 1 and 2