First round of changes performed. Need to update PHP