Some interesting adjustments by Gil Catarino and Mahamed Aly