Reformating to match previous year's code