Reworked Haff rating implementation