merge with brian branch