Updated header; removed eval