Made a few adjustment