Dropped @dustinblackman code for @trevorstarick