change a bit the structure