Goncalo/improvements/color occurrences