trimmed out some commented out code