updates to base code