Edit word choice, add from when