Changed everything, function and form