Updated to use economy