Improved the form