new feature
merged and fixed conflicts