Add latest changes from Chiyo