Additionnal contributions from Ishamael.