Updated with minibufexplorer changes