Added refactored estuff