added PHI/PSI calculations