Even more TPS improveing