Removed Settings, Added Error Handling