changes to reflect Elaine's design