feature 3 further changes
Merge branch 'feature_3'