forms updated with Isaac's changes - conflicts resolved