Made the changes you said