before I split classes for safety