Nicole's changes