Got rid of Shiro's static stuff