change of variable name and add parameter to wait_for...