Added some extra billing crap