slight changes from starter ui 5/30 9:50AM