Added conditions for first and second years