commented out some duplicate stuff