Updated to support new monthly view and requirements