commented out a couple things