fixed feature 3
Merge branch 'redoing_feature_3'