Swapping behaviours and more debugging