Updated to use v0.8.11