Updated to remove pdb statement that was resulting in 500 error