added changes on class name and deletions