Final version from editor