FIXED bug that didn't call sent success event and some minor code improvement