A few improvement