my modifications to Hesk 2.5.2