Merged with "comparison feature" branch