Elodie custom changes