HCI Finished
Manual Merge