defines refactored
merge fix