Update live code to map better to exercises