If you real want me to move it, i would prefer to do it in a separate PR