Nicole's even newer changes