Refactored code, still show