added some packaging (untested)