last fixes before color change
color changes