adding the last two classes :(