Note: There is a balancing patch (just changing some numbers) but I'm not sure if I can apply it since the Hackathon has ended.
