Adapted to new curir conventions