Made some changes in terms of input range