improved the form a little bit