! tweak class so its testable