commented out a few problematic methods