updated form and solutions