unfixed code in many places