removed ipdb.set_trace()