Updated functions on load order