Working version after Rapperswil