Changed color assignment