Changing eval to Function