Better Logic and fixed PSI call