first commit of the editcap patch