Setup: somes changes