Tidying up after inclusion of Nicole's variables.