adaptation to Goji's changes