888 support as discussed

Thanks!