Improve issues sep 18