Added several things to handle weeks