Updating to new native loading method
Merging