all eval() removed