ported some of the old loader back in