Fixed bug Sets the first day of Week
Simplified shrimp2ts work