refactored goodies