deleted some unnecessary commented out text