For many years I had been taught that John chapters 13-17 all took place in the upper room.

Yet at the end of chapter 14 it says:

John 14:31b Arise, let us go hence.

Then, at the beginning of chapter 18 it says:

John 18:1 When Jesus had spoken these words, he went forth with his disciples over the brook Cedron, where was a garden, into the which he entered, and his disciples.

So is it possible that John 15-17 took place as they walked to the garden of Gethsemane?