Added the changes as requested by POGs and PAGs.