Re work (9/17)

Re work