updated, needs one final color change