adapted to new design