experimentally removed expensive function calls