address @eldeveloper comments