remove pdb
working first pass