moved over some changes from cvs