Sept 18th merge