Adapted to be more like working wrapper