Full & partial comparison (optimized)

Added