more changes to base code