minor changes, added a singleton pattern
made some changes in order to pull remote
merged new changes