Minor, added make func
Updated to be compatible with Control module