changed class name. Code refactored