some changes, but not happy about HAL