HEAP finally works
removed unnecessaries