Making Changes per Dr Dron suggestions