branch/HUD-Performance

@eric79 Want to test this branch out and then let me know if I can merge?