Adapted to newest lbis