minor changes in loading order