Done Some Changes to resolve issues