Switched to using block calls instead of eval.