reworked repacking for mac and others