Changed the forms a bit