add controllers in place and minor modifications