refresh draft version completed, need to improve!!