refactored monday