Work issues (7/18)

Work issues