Romina's changes