Applied all the changes except for the last part above removing parent:submit.