add parameter to choose keeping organized