Edits to calform