Revised to avoid shape