Updated forms with .standard as per Issue #4