Changed the form a little bit