Add back elementary ones -- 1-22