Changed everything to use color analysis