first implemnet of billable fix