Minor Changes
More changes