some edit & stuff