Improved design, started adding  week detection