Fixed issuse and some new changes