tweak to general forms