final update on loader structure