#1 fixed
rewrite classes