Improving the form AND doing this by myself