added color handling