refactor solo fetch
 refector solo fetch