Fix table better hurr