Migrating to use psi