Refactored the Free Day functionality