Completion years now updated properly