Originally intended changes