Merge Haley's changes