rebuild solutions
remove origin ugly code