changed colors based on daniel