small tweak to the class structure