Addeed the rest of the changes