added moonshine support