improved client index