updating the forms to use the method instead of the raw key