updated for moonshine version 0.0.6