diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ef29eeab..c3e0510b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,22 +1,35 @@
 <!--
 
-The title for your pull request should be made in this format
+You must title your PR like this:
 
-CITY CLASS_NO - FIRST_NAME LAST_NAME - MODULE - WEEK_NO
+REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
 
 For example,
 
-London Class 7 - Chris Owen - HTMl/CSS - Week 1
+  London | May-2025 | Carol Owen | Sprint-1
 
 -->
 
-# Your Details
+## Learners, PR Template
+<!--
+  The purpose of the self-checklist is to help ensure the quality and completeness of a PR submission.
+
+  You must complete all the tasks in the self-checklist and tick the boxes for those you have finished.
+
+  You can tick a box by changing [ ] to [x] (with no spaces inside the brackets).
+-->
 
-- Your Name:
-- Your City:
-- Your Slack Name:
+Self checklist
 
-# Homework Details
+- [ ] I have titled my PR with REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
+- [ ] My changes meet the requirements outlined in the `README.md` of this task
 
-- Module:
-- Week:
+## Changelist
+
+<!--
+  When you submit a PR, you're submitting changes you made to your own copy (fork) of the repository and requesting a review of those changes.
+  It is best practice to leave a brief description of the changes you have made.
+
+  You must replace "Briefly explain your PR." with a brief description of the changes you have made.
+-->
+Briefly explain your PR.
diff --git a/README.md b/README.md
index 22a26be5..f158d4a8 100644
--- a/README.md
+++ b/README.md
@@ -8,5 +8,10 @@ Can you help him to fix or improve the answers to his homework?
 2. Clone the repository to your computer
 3. Create a branch with an appropriate name for the task you're on
 3. Fix the errors in Linus's homework in `homework.md`
-4. Create a Pull Request back to this repository with the correct answers
+4. Create a Pull Request back to this repository with the correct answers. Make sure your Pull Request is created in CodeYourFuture's fork, not your personal fork.
 
+
+## How to check your work?
+If you have correctly submitted your PR, you can find it in https://github.com/CodeYourFuture/GitHomeworkFixErrors/pulls.
+
+Please note that your PR will not undergo an official review, as none is required. Most PRs at CodeYourFuture get reviewed, but this one is just for you to practice creating them.
diff --git a/homework.md b/homework.md
index 35d995b6..f7a8449a 100644
--- a/homework.md
+++ b/homework.md
@@ -1,113 +1,25 @@
 # Linus's Homework
 
-## Question 1
-
-What is 2 + 2?
+## 1. What is 2 + 2?
 
 5
 
-## Question 2
-
-What is the opposite of Black?
-
-Purple
-
-## Question 3
-
-What is the  2 * 3 * 6 * 1 * 10 * 34?
-
-1322
-
-## Question 4 
-
-What does HTML stand for?
-
-Hyper Tall Massive Language
-
-## Question 5
-
-What is CSS useful for?
+## 2. What is JavaScript?
 
-Making a website go faster
+An exciting new play about coffee.
 
-## Question 6
+## 3. What three problems does Git & GitHub solve?
 
-Using CSS, how would I select every `<h1>` tag on the page?
+When people want to show off code to each other they can put it on GitHub
 
-```css
-#h1 {
-
-}
-```
-
-## Question 7
-
-What is JavaScript?
-
-A programming language used on the internet
-
-## Question 8
-
-What three problem does Git & Github solve?
-
-When people want to show off code to each other they can put it on Github
-
-## Question 9
-
-What happens when you `fork` a repository?
+## 4. What happens when you `fork` a repository?
 
 You delete it
 
-## Question 10 
-
-What happens when you clone a repostory?
+## 5. What happens when you clone a repository?
 
 It send it to a friend
 
-## Question 11
-
-What is a Pull Request?
+## 6. What is a Pull Request?
 
 When you send a file over the internet
-
-## Question 12
-
-What is the Git History log?
-
-It lets you see into the future
-
-## Question 13
-
-What does it meant to "push" changes to Github?
-
-You send the changes of your local repository to Github
-
-## Question 14
-
-What is Github?
-
-A place for us to store and share our code.
-
-## Question 15
-
-What does it mean to "Commit your changes"?
-
-Send you code to Github
-
-## Question 16
-
-What program do we use to write code at CodeYourFuture?
-
-Microsoft Word
-
-## Question 17
-
-What do you use "Commit Messages" for?
-
-To record what changes you made to the code
-
-## Question 18
-
-Where can I look to find help with Git?
-
-The Git Cheatsheet!