commented out some wrong code