added packrat support