diff --git a/users/recordservice/record-service.js b/users/recordservice/record-service.js
index 4528a2b6..dace39b2 100644
--- a/users/recordservice/record-service.js
+++ b/users/recordservice/record-service.js
@@ -1,7 +1,8 @@
 const express = require('express');
 const mongoose = require('mongoose');
 const bodyParser = require('body-parser');
-const Record = require('./record-model')
+const Record = require('./record-model');
+const { SystemUpdate } = require('@material-ui/icons');
 
 const app = express();
 const port = 8004;
@@ -9,6 +10,10 @@ const port = 8004;
 // Middleware to parse JSON in request body
 app.use(bodyParser.json());
 
+var ranking = [];
+var lastTime = new Date();
+const minTimeDifferenceInMiliseconds = 120_000;
+
 // Connect to MongoDB
 const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
 mongoose.connect(mongoUri);
@@ -44,24 +49,8 @@ app.post('/record', async (req, res) => {
 
 app.get('/record/ranking/top10', async (req, res) => {
   try {
-    const usersCompetitiveStats = await Record.aggregate([
-      // Unwind the games array to work with each game separately
-      { $unwind: "$games" },
-      // Match only competitive games
-      { $match: { "games.competitive": true } },
-      // Group by user and calculate total points and total competitive games per user
-      {
-          $group: {
-              _id: "$user",
-              totalPoints: { $sum: "$games.points" },
-              totalCompetitiveGames: { $sum: 1 } // Count the number of competitive games
-          }
-      },
-      // Sort by total points in descending order (top 1 will have the highest points)
-      { $sort: { totalPoints: -1 } },
-      // Limit to the top 10
-      { $limit: 10 }
-    ]);
+    let usersRanking = await getRanking();
+    let usersCompetitiveStats = usersRanking.slice(0, 10);
 
     res.json({usersCompetitiveStats: usersCompetitiveStats });
   } catch (err) {
@@ -72,25 +61,13 @@ app.get('/record/ranking/top10', async (req, res) => {
 app.get('/record/ranking/:user', async (req, res) => {
   try {
     const user = req.params.user.toString();
-    //Gives back an array of 1 user
-    const userCompetitiveStats = await Record.aggregate([
-      { $match: { user: user } },
-      // Unwind the games array to work with each game separately
-      { $unwind: "$games" },
-      // Match only competitive games
-      { $match: { "games.competitive": true } },
-      // Group by user and calculate total points and total competitive games per user
-      {
-          $group: {
-              _id: "$user",
-              totalPoints: { $sum: "$games.points" },
-              totalCompetitiveGames: { $sum: 1 } // Count the number of competitive games
-          }
-      }
-    ]);
+
+    let usersRanking = await getRanking();
+    let userCompetitiveStats = usersRanking.filter(userData => userData._id === user);
     
     res.json({userCompetitiveStats: userCompetitiveStats[0] });
   } catch (err) {
+    console.log(err)
     res.status(500).send();
   }
 });
@@ -108,6 +85,37 @@ app.get('/record/:user', async (req, res) => {
   }
 });
 
+
+async function getRanking(){
+  const nowTime = new Date();
+  let timeDifferenceInMiliseconds = nowTime - lastTime;
+  if(ranking.length == 0 || timeDifferenceInMiliseconds > minTimeDifferenceInMiliseconds){
+    ranking = await Record.aggregate([
+      // Unwind the games array to work with each game separately
+      { $unwind: "$games" },
+      // Match only competitive games
+      { $match: { "games.competitive": true } },
+      // Group by user and calculate total points and total competitive games per user
+      {
+          $group: {
+              _id: "$user",
+              totalPoints: { $sum: "$games.points" },
+              totalCompetitiveGames: { $sum: 1 } // Count the number of competitive games
+          }
+      },
+      // Sort by total points in descending order (top 1 will have the highest points)
+      { $sort: { totalPoints: -1 } }
+    ]);
+
+    //The operator ... dumps the user json making it {_id , totalPoints, totalCompetitiveGames, position}
+    ranking = ranking.map((user, index) => ({ ...user, position: index + 1 }));
+    lastTime = new Date();
+  }
+  
+  return ranking;
+  
+}
+
 const server = app.listen(port, () => {
   console.log(`Record Service listening at http://localhost:${port}`);
 });
diff --git a/users/recordservice/record-service.test.js b/users/recordservice/record-service.test.js
index a42d1978..5594f781 100644
--- a/users/recordservice/record-service.test.js
+++ b/users/recordservice/record-service.test.js
@@ -239,6 +239,7 @@ describe('Record Service', () => {
     const userStats = responseGet.body.userCompetitiveStats;
 
     expect(userStats).toHaveProperty('_id', 'user1');
+    expect(userStats).toHaveProperty('position', 10);
     expect(userStats).toHaveProperty('totalCompetitiveGames', 2);
     expect(userStats).toHaveProperty('totalPoints', 20); //i * 10 * totalCompetitiveGames , i = 2
   });