Made Some Changes