better packaging #306