reverted some of the changes, readying for merge.