Update from Flashtalking: Remove use of eval();