Check in with bill calculator page and email sender
merge master