Working a bit more on Shiro