I thought that having more generic code would be good for the tutorial. Do you want me to swap it?