-cleaned local modif on v1.1