and all what I did is refactor this sample