better package handling