1. Change some logics of client
2. Add progress bar