Added ability to manage mutiple years