Add preload method
Fix merge error