Reworked the form