If I remember correctly although both are valid, but the second method is preferred day-by-day order 2fajr - 4zuhr - 4asr- 3maghrib - 4isha -3witr. And yes, don't forget to pray 3 rak'at of witr as it is wajib to make it up as well.