Commented out a few things