Finished another improvement