got rid of eval