Refactored with force