Enh: Completed basic management of ordinary actions