design changes
fixed conflicts