Some of changes and Bug Fixes