Minor Changes
Merged with Main Project