Some more tweeking, more yellow