some edit !!