commenting out some possibly unnecessary things