Fix/table manipulation