Change the loading order as requested by fehguy