Made the basic changes