Commited new changes

Please review and merge