added weekyear stuff