merge hamish changes