Changed the way how the value is taken