Is there a cleaner way we can toggle this rather than commenting + uncommenting lines?