Added Point 1
Roll-back point 2