Commented out changes, should be back to working version.