base from revision1