Did a bit of rearranging as well as better compatibility.