added the rest of the form