better fast color - not final
Merge commit '6b2e02b63d304d5b1edad08339e9e2f7b14f9fba'