part1 small modifs