Fixed Paypla but need some refactor