Updated with new 'load only' mode