removed same serv check