updated to fit with weekend changeS
fix1