Modified the execution order in master.js