Properly include both changes this time (whoops)