Little more work on Pawn