More changes
Bugfix (addclass instead of addClass)