Changed class name and modified method