reworking, refactoring, expanding