Finished code change