Added verbose checks and Select value