work in progress, updating to ARC, modernising