Fixed template issue and added PD2 comments