Added some presently unused code