make packaging homogenous too