changes in light of @coderoshi comments