Fixed conflicts to Andy's PR