commented out a few things