Colors fixed
Removing debug logic