updated to support 8.8