changing forms to use same syntax