improve packaging