changed a bit the form