Update for all subjects

Now it works with any subject u choose