The version with proper setting