A few more adjustement