Update to include block day and all other changes