took out the commented out stuff