First Of Week logic needed to be updated