New Class
Small changes