tweaking base classes