modified to contain new PHP