Added some discovered code from 2010