WiP: try to make things a bit clearer