Improve some solutions...