var in feature 3
Merge feature 3 latest changes