really fixing up packager this time