methodOverride feature refactored and seems to work