Made a Few Changes