added numeric value checks