implementing feature3
implementing more feature3
merging feature2 feature3