Changed file load order and added failsafes