TPS added but not working properly yet