diff --git a/open-led-race/open-led-race.ino b/open-led-race/open-led-race.ino
index 6386c76..e33b7f2 100644
--- a/open-led-race/open-led-race.ino
+++ b/open-led-race/open-led-race.ino
@@ -664,8 +664,11 @@ void draw_car( track_t* tck, car_t* car ) {
     
     switch ( car->trackID ){
       case TRACK_MAIN:
-        for(int i=0; i<=1; ++i )
-          track.setPixelColor( ((word)car->dist % cfg->nled_main) - i, car->color );
+//        for(int i=0; i<=1; ++i )
+//          track.setPixelColor( ((word)car->dist % cfg->nled_main) - i, car->color );
+        uint8_t carlenght = car->nlap < 6 ? car->nlap : 6;  // Max cartatail lenght = 7
+        for(int i=0; i<= carlenght; ++i )
+          track.setPixelColor( ((word)car->dist % cfg->nled_main) + i, car->color );
         if(param_option_is_active(&tck->cfg, BATTERY_MODE_OPTION)){ // Battery Mode ON
           if ( car->charging==1 ) {
             track.setPixelColor( ((word)car->dist % cfg->nled_main) - 2, 0x010100 * 50*(millis()/(201-2*(byte)car->battery)%2));