Street Totochèr: Optimization an fix minority bug

optimization - fix minority bug