adapted to blasw changes