updates
chris merge