1. Now seems to work reasonably well to rebuild forms