diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..ec5a186 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,31 @@
 ---
-name: Bug report
+name: Bug Report
 about: Create a report to help us improve
 title: ''
-labels: ''
-assignees: ''
-
+labels: 'bug'
+assignee: 'AlrasheedA'
 ---
 
-**Describe the bug**
+## Describe the bug
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+## To Reproduce
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+Please share the **code and steps** needed to reproduce this behavior.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+- Include a **minimal, self-contained working example**
+- Avoid referencing large datasets or unrelated parts of your code.
+
+## Expected Behavior
+
+A clear and concise description of what you expected to happen.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+## Additional context
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+Include any of the following if relevant:
 
-**Additional context**
-Add any other context about the problem here.
+- Error messages or stack traces
+- Screenshots
+- Environment details (OS, Python, package versions, etc.)
+- Any other context that might help diagnose the issue
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
deleted file mode 100644
index 48d5f81..0000000
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Custom issue template
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..e7cb187 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,24 @@
 ---
-name: Feature request
+name: Feature Request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: 'enhancement'
 assignees: ''
-
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Describe the feature
+
+What would you like to see added or changed?
+
+## Use case or motivation
+
+Why is this feature useful or necessary? How would it improve your workflow?
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+## Additional context
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+Include any of the following if helpful:
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+- Example use cases
+- Screenshots or mockups
+- Similar features in other tools
+- Suggested implementation details