Reorganizing as req in #84