some 1.5 changes