Elise's changes