remove ipdb
improve process