Refactored super method, chenged structure