Updated color detection
Merging