updated to handle additional colors