incorporate latest tweak