a few improvement