Updated to a single table