copy changes as per Gemma request