Version of form that works