updated form stuff in demo 10/23