some more form work, considering simplification