Some Changes and Error Solved