remove eval; scalability