* Enhance the older/newer logic. It's still not quite right.