Improved code a bit
Improvements
Sept 16 daily added