got rid of eval which is not working
merged