Kaze suggestion addressed