More attempts at making the form work