Updated and improved forms