commented out some lines #45