Change Heap ID, make settings clearer