some changes to base code