address @coderoshi comments