ECE-36 Feature 2 updated