added calls to all control functions