WIP of a rework of an old piece