nee class and bug fix