comment out experimental stuff
updates from dbushell.com (v7)