Fixed the create tables to take week out of PK