OK for the BC: I'll still simplify the code on merge though