na bug fixed, hcl adjusted