adapted to suggestions