changed date to 10/5
merged