need to solve some more problem