packaging cruft added