more work on evalutaion
merged