Update presentation code to match master