...
simplify the whole project