Merge with Kyles changes as of 32ac5f2