improved forms etc