WIP tightening up old vs. extended hints