changed the form slightly