modified wrapper