Refractor and add economy