tweaked the eval function a bit