Updates by Kassoun