minor changes for hint timing, test needed.