I'm going to be a little optimistic. They've found clever ways of updating the series, and I hope they don't go the all-too cliched and obvious route of punching. Of course, that may depend on Moffat, since he went a terribly unimaginative route with 2.01 But I've mostly forgiven him for that one.