Pre-revert Changes

Output from simulator has degraded; trying to figure out why.