rubber color + some refactor