Applied patch to allow for more args. Removed cancel button.