rejigging forms