Work issues (17/18)

Work issues