More tweaks to reflect slide code