Shashank Bugs fixed