Minor Changes
Merged