diff --git a/endpoints/books.get.py b/endpoints/books.get.py
index 12c7ec2..d5f875f 100644
--- a/endpoints/books.get.py
+++ b/endpoints/books.get.py
@@ -1,27 +1,32 @@
-from fastapi import APIRouter, Depends, status
+from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
-from typing import List
+from typing import List, Optional, Union
+from uuid import UUID
+
 from core.database import get_db
+from helpers.book_helpers import get_all_books, get_book_by_id
 from schemas.book import BookSchema
-from helpers.book_helpers import get_all_books
 
 router = APIRouter()
 
-@router.get("/books", response_model=List[BookSchema], status_code=status.HTTP_200_OK)
-def get_all_books_endpoint(
-    skip: int = 0, 
-    limit: int = 100,
+@router.get("/books", response_model=Union[List[BookSchema], BookSchema])
+async def get_books(
+    book_id: Optional[UUID] = Query(None, description="ID of the book to retrieve"),
+    skip: int = Query(0, description="Number of records to skip"),
+    limit: int = Query(100, description="Maximum number of records to return"),
     db: Session = Depends(get_db)
 ):
     """
-    Retrieve all books from the database with pagination.
+    Get books with optional filtering by ID.
     
-    Parameters:
-    - skip: Number of records to skip (for pagination)
-    - limit: Maximum number of records to return (for pagination)
-    
-    Returns:
-    - List of books
+    If book_id is provided, returns a single book.
+    Otherwise, returns a list of books with pagination.
     """
-    books = get_all_books(db=db, skip=skip, limit=limit)
+    if book_id:
+        book = get_book_by_id(db, book_id)
+        if not book:
+            raise HTTPException(status_code=404, detail="Book not found")
+        return book
+    
+    books = get_all_books(db, skip=skip, limit=limit)
     return books
\ No newline at end of file