Commented out some quantities