Trying to fix default server loading
Merging