Re work (12/17)

Re work