Improve the g