More changes to Feature 1.1
Lats changeto Feature 1.1 branch