changed names and took out lines used to debug