Any Mail/Express trains can not have more than 15 stops and SF or any luxury trains like Rajdhani, SK, AC Express, etc to have max 10 intermediate stops irrespective of the distance they travel. Otherwise, Both passengers as well as Railways lose economically. Reoptimise all routes with this rule and one can accommodate another 1000 trains and put a full stop to waiting list. No need to wait for 6 more years