fixup! address ryans comments