fixed up billing flow