fixed problems, evaluate now works inside calculate