Modifications to get it to work, waiting for Nadrieril's agreement.