Changes to previous commit for clarity