removed pdb.set_trace()