tweaked the back end
fixed conflicts