adapted to ours