[dalto]

I have to admit that I did make a couple of minor post testing changes to this so hopefully it isn't broken.

If anyone has any issues I will fix them in couple of hours.