still fixing table class