More work on Shiro