Refactored again....