Help with replacing the existing form to the new format