updated to support moonshine 0.0.5