Updated HS Handler