modified enshelf/unshelf ifs to not be shelf specific