HAL-321: Second part