Edit to make flatness more consistent