Commented out some lines