Feature 1.1 change