some adjustments after Ali review