Changes

Merged conflict
Added Singleton
Added Comments