conflicts
merged Jack's changes