some edit :(