Fixed commented-out functions