updated for 10/6-10/12