finally getting around to fixing twheat