Updates to make the presentation flow better