Updated with colors