small changes in the class controller
small changes in the class controller
solve the recent issues