Recommit andrei's heats and clues