Modifications As Per Junxiao's Comments