Tuple changes. Minor. Left comments in for faster testing.