colors changed and adding singleton