commented out some bugs