D78 Refurb - work in progress