minor modifications during meeting
fixed conflicts