added colors
added type