Added commented-out code for #25