Changed Zoe so merge can occur