Finished round2 changes