Updated for Bug fixing