diff --git a/controllers/eventsViaSupabase.js b/controllers/eventsViaSupabase.js
index 32a8042..e393ed0 100755
--- a/controllers/eventsViaSupabase.js
+++ b/controllers/eventsViaSupabase.js
@@ -1,25 +1,15 @@
-import { deleteAuthDataFrom, getAuthDataFrom, insertAuthDataTo, updateAuthDataTo } from "../dbHelper.js";
-import { getEventsData, getEventIdData } from "../adapters/supabaseAdapter.js";
+import { deleteAuthDataFrom, getAuthDataFrom, getDataFrom, insertAuthDataTo, updateAuthDataTo } from "../dbHelper.js";
 
-export async function getEvents(req, res) {
-  try {
-    const data = await getEventsData();
-    res.status(200).json(data);
-  } catch (err) {
-    res.send(`error in viaSupabase: ${err}`);
-  }
+export async function getAllEvents(req, res) {
+  getDataFrom(req, res, "events", req.params.id);
 }
 
-export async function getEventId(req, res) {
-  try {
-    const EventId = parseInt(req.params.number);
-    const users = await getEventIdData(EventId);
-    res.json(users);
-  } catch (error) {
-    res.status(500).send(error.message);
-  }
+export async function getChosenEvent(req, res) {
+  getDataFrom(req, res, "events", req.params.id);
 };
-
+export async function getAllCategories(req, res) {
+  getDataFrom(req, res, "event-categories");
+}
 
 export async function getAuthAllEvents(req, res) {
   getAuthDataFrom(req, res, "events");
diff --git a/routes/index.js b/routes/index.js
index 713da09..0b2e23e 100755
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,6 +1,6 @@
 import express, { Router } from 'express';
 import cors from 'cors';
-import { getEvents, getEventId } from '../controllers/eventsViaSupabase.js';
+import { getAllEvents, getChosenEvent, getAllCategories } from '../controllers/eventsViaSupabase.js';
 
 const router = express.Router();
 
@@ -19,7 +19,8 @@ router.options('/', (req, res, next) => {
   }
 });
 
-router.get('/', cors(), getEvents);
-router.get('/:id', cors(), getEventId);
+router.get('/', cors(), getAllEvents);
+router.get('/categories', cors(), getAllCategories);
+router.get('/:id', cors(), getChosenEvent);
 
 export default router;