Oops, restoring some options from the merge