Commented out new stuff, reverting to old