added some base code