Addition of point 3 and changes to 1 and 2.