Work issues (16/18)

Work issues