Removed hardcoded affix offsets