Re work (3/17)

Re work