Further reworking

Changes missed on last commit