Added transitions and different shading