refractor back to the old package