fixes for nicole