add psi
added settings