Finished changes