Changed loading order