final tweaks on 1.89