Some others modifications