the only thing need fixing is the edit to the tables