Upgrading to the latest marmot