tweaked to a rusty test4 and test5
fixed conflicts