Made changes to classify and improved on psi calculations