Updated to include changes for second phase

Updated to include changes for second phase