some more references removed to ABS