variable name improved, need to be tested