Adapting base code to work with ulib...