diff --git a/src/js/components/Dater.js b/src/js/components/Dater.js
index f6bea4ba..30439153 100755
--- a/src/js/components/Dater.js
+++ b/src/js/components/Dater.js
@@ -70,8 +70,9 @@ export default class Dater extends React.Component{
 				var duration = 0;
 				var tracks = this.props.data
 				for(var i = 0; i < tracks.length; i++){
-					if (tracks[i].duration_ms ) duration += parseInt(tracks[i].duration_ms);
-					if (tracks[i].length ) duration += parseInt(tracks[i].length);
+					if (tracks[i].duration ){
+						duration += parseInt(tracks[i].duration);
+					}
 				}
 				return this.durationSentence(duration)
 				break
diff --git a/src/js/services/spotify/reducer.js b/src/js/services/spotify/reducer.js
index 22ea047c..c0e84e36 100755
--- a/src/js/services/spotify/reducer.js
+++ b/src/js/services/spotify/reducer.js
@@ -213,16 +213,7 @@ export default function reducer(spotify = {}, action){
             var tracks = action.data.items
 
             if (tracks){
-                for (var i = 0; i < tracks.length; i++){
-                    var track = Object.assign(
-                        {},
-                        tracks[i].track,
-                        {
-                            added_at: tracks[i].added_at
-                        }
-                    )
-                    tracks[i] = track
-                }
+                tracks = helpers.formatTracks(tracks);
                 if (spotify.library_tracks){
                     tracks = [...spotify.library_tracks,...tracks]
                 }
diff --git a/src/js/views/Track.js b/src/js/views/Track.js
index de128724..2f4a682f 100755
--- a/src/js/views/Track.js
+++ b/src/js/views/Track.js
@@ -204,10 +204,7 @@ class Track extends React.Component{
 							{track.disc_number && track.track_number ? <span>, </span> : null}
 							{track.track_number ? <span>Track {track.track_number}</span> : null}
 						</li>
-						<li>
-							{track.duration ? <Dater type="length" data={track.duration} /> : null}
-							{track.length ? <Dater type="length" data={track.length} /> : null}
-						</li>
+						{track.duration ? <li><Dater type="length" data={track.duration} /></li> : null}
 					</ul>
 				</div>