Modifs from previous branch...