Sep 08, 2018 - A few Improvements