moving stuff around to work with more modern load paths
updates