Continued to modify code