class version

Switching to a class version