Small changes to help presentation flow