Re work (11/17)

Re work