Simplified config slightly