Improve some point