added some fixed for sync and success