improved handling for Psi and Elite clients