For the moment, commented out the stuff that does not work.