structure was refactored