working on #30; now form appears only once