Some tweaking and added HAP