Fixes #1
Form updates