changed algorithm for current week slightly