Trying to handle next and last weeks more accurately