commented out some silly stuff