17.7 - added billions support