Adapt Clara's modifications