Dev chris merge