Package makes more sense now