Merge with evalspot