updated to old diagram of Chibi