removed timings
bug fixing
Refactoring and bug fixing