MH - Modified some stuff. I should check in more often.