Added upper/lower week support