lines 28-30 are now commented out, and they are a subset of what's already in lines 18-22. - so just remove these from the comment?