Added weekly calculation