little refactoring and one more parameter in gtvalues