[MERGE] Somes improvements