Config update

Berge's XP changes implemented