Updated PHI generation things