Fixed some more bugs in HC
no more dublications