colors working
Merged