Improve it one last time