base code improvement