removed the commented out stuff