Tweaked forms again