Final pre-Rapperswil changes, for real this time