[HAL-1] make start on improving