feature: sol004 and sol007