Marcella's changes