Made some changes in preparation for presenter wrapping