adding skipweek support back in