Much more elegant