Error Removed and optimized