removed more client specifics