Added features to Control.g