adding some front end
fixed conflicts