Dan and ron merge fix