some incomplete changes for chichi