changes from Sanjo