Merged Nicole's branch with the main branch