Discarded code for issue #1