More work on billing-days