Added changes for first part of p3b