fixed issues related to naming the file
Merge branch 'testing'
few tweaks and optimizations - removed unnecessary calls