Commented out some code. Need to fix