06 - Removed subject where it allows for less lines of code