Vaucher refactored