Comments from azlarab oujdad (@izounex)