changed class (hint by Mikel)