Form updates from work on OSSide