Includes Fidi's changes to deprecated calls for the N-Z PHP files