revised, color triangle working