Mirella's changes