Update config
Fix CS