minor changes for 2nd part