Comments from Alaa Aktaa (@GiggzApp)