Modified with new billing calls