First pass on control update

First pass on control update