pre-merge changes
merged Owen's change