Merging erocs' changes in with mine.