Aaahh, again that stuff.

Check previous commit for changes