PACK-22: More updates