address @coderoshi's comments