Moved the sinks from the heap to the stack