Re work (6/17)

Re work