Lots of tweaks, modularity.

Desire HD compiles <3