replaced hardcoded dates with algorithm to determine current week