forgot to add back in payment handling