A few adjustment