Minor Changes to fit the program