Resolve conflict after merging with Tim's PR