That last commit was a bit stupid, its better now