Update form and TODO