final changes for this year

fadfadfdaffdafada