removed eval
performance tuning