Final pre-Rapperswil changes