diff --git a/src/app/rms/leaderboard/leaderboard-head.component.html b/src/app/rms/leaderboard/leaderboard-head.component.html
index 328a26ae..2844693b 100644
--- a/src/app/rms/leaderboard/leaderboard-head.component.html
+++ b/src/app/rms/leaderboard/leaderboard-head.component.html
@@ -1,4 +1,4 @@
-<div class="position cell" *ngIf="fields.length > 5">
+<div class="position cell" *ngIf="pos">
     <span class="title">POS</span>
 </div>
 <div *ngFor="let field of fields" [ngSwitch]="field" [ngClass]="[field, 'cell']">
diff --git a/src/app/rms/leaderboard/leaderboard-head.component.ts b/src/app/rms/leaderboard/leaderboard-head.component.ts
index 89e55c28..46127ca9 100644
--- a/src/app/rms/leaderboard/leaderboard-head.component.ts
+++ b/src/app/rms/leaderboard/leaderboard-head.component.ts
@@ -8,4 +8,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 })
 export class LeaderboardHeadComponent {
   @Input() fields: string[];
+  @Input() pos: boolean;  // FIXME: move to fields?
 }
diff --git a/src/app/rms/leaderboard/leaderboard-lap.component.html b/src/app/rms/leaderboard/leaderboard-lap.component.html
index baa292b6..bf8aaeb6 100644
--- a/src/app/rms/leaderboard/leaderboard-lap.component.html
+++ b/src/app/rms/leaderboard/leaderboard-lap.component.html
@@ -28,5 +28,17 @@
             {{times[0] - times[3] | time:'s.sss'}}
         </span>
     </ng-template>
+    <!--
+    <ng-template ngSwitchCase="lastlap">
+        <span [ngClass]="{best: last[0] - last[1] == item.best[0], allbest: last[0] - last[1] == best[0]}">
+            {{last[0] - last[1] | time:'s.sss'}}
+        </span>
+    </ng-template>
+    -->
+    <ng-template ngSwitchCase="status">
+        <span *ngIf="last" [ngClass]="(last[0] - last[1]) > (times[0] - times[1]) ? 'pos-up' : 'pos-dn'">
+        </span>
+    </ng-template>
+
 </div>
 
diff --git a/src/app/rms/leaderboard/leaderboard-lap.component.ts b/src/app/rms/leaderboard/leaderboard-lap.component.ts
index 9b37cdfa..58af17ac 100644
--- a/src/app/rms/leaderboard/leaderboard-lap.component.ts
+++ b/src/app/rms/leaderboard/leaderboard-lap.component.ts
@@ -13,6 +13,7 @@ export class LeaderboardLapComponent {
   @Input() item: LeaderboardItem;
   @Input() times: number[];
   @Input() best: number[];
+  @Input() last: number[];
   @Input() intlap: number;
   @Input() fields: string[];
 }
diff --git a/src/app/rms/leaderboard/leaderboard.component.html b/src/app/rms/leaderboard/leaderboard.component.html
index 949f783c..50e132db 100644
--- a/src/app/rms/leaderboard/leaderboard.component.html
+++ b/src/app/rms/leaderboard/leaderboard.component.html
@@ -1,4 +1,4 @@
-<leaderboard-head class="row" [fields]="fields"></leaderboard-head>
+<leaderboard-head class="row" [fields]="fields" [pos]="true"></leaderboard-head>
 <leaderboard-item class="row" *ngFor="let item of items; odd as isOddRow;"
                   (click)="showDetails(item)"
                   [ngClass]="isOddRow ? 'odd' : 'even'"
@@ -26,7 +26,13 @@
             <leaderboard-head class="row" [fields]="detailFields"></leaderboard-head>
             <leaderboard-lap class="row" *ngFor="let times of detail?.laptimes; odd as isOddRow; index as i; count as n"
                              [ngClass]="isOddRow ? 'odd' : 'even'" 
-                             [lap]="n - i" [item]="detail" [times]="times" [best]="best" [intlap]="intlaps[detail?.id]" [fields]="detailFields">
+                             [lap]="n - i"
+                             [item]="detail"
+                             [times]="times"
+                             [best]="best"
+                             [last]="detail?.laptimes[i + 1]"
+                             [intlap]="intlaps[detail?.id]"
+                             [fields]="detailFields">
             </leaderboard-lap>
         </ion-content>
     </ng-template>
diff --git a/src/app/rms/leaderboard/leaderboard.component.ts b/src/app/rms/leaderboard/leaderboard.component.ts
index f65a4d1e..8e0538e6 100644
--- a/src/app/rms/leaderboard/leaderboard.component.ts
+++ b/src/app/rms/leaderboard/leaderboard.component.ts
@@ -35,8 +35,8 @@ const FIELDS = [{
 }];
 
 const DETAIL_FIELDS = [
-  'lap laptime gap int',
-  'lap laptime sector1 sector2 sector3'
+  'lap laptime gap int status',
+  'lap laptime sector1 sector2 sector3 status'
 ];
 
 export class LeaderboardItem {