Re work (5/17)

Re work