updated with some of Ella's suggestions