Added Feature 1.2