fixed some logic for stripe, need to test