tidied up loader