adapted to new grammar