Unity

We could do with having the code unity compatible from now on otherwise it's more to change down the line.