Comments from fegabe Dev (@fegaDev)