Changed eval a bit