Change to grammer as requested by wwrd