rewrite / 4.4 changes