color handling added