Removed Dependency and Bug Fixes